some fixes in directives