Fixed issues with loading files/folders correctly.