Fixed up a bunch of directives