More minor changes for file paths