Clean up some file paths