Added extra dir values to suppress warnings.

Also some extra newlines.