fixes for deprecated directives