fix deprecation issues