Made some small file loading changes