Fix some file configuration issues