Fixed some file getter bugs