Fixed issues with file import