Fixed issues with file paths etc.