Fix issues with loading files in same directory