fixes to directives