Fixing, adding directives...