Fixes in directives