Fixed file loading calls