Fixed up common directives