Clean up warning and deprecation issues.