Some file and permissions cleanup