Fix some file permissions and white-space