fixed deprecation issues