Minor updates to directives