Fixed some file issues