Code convention fixes for directives