- File source fixes