Cleanup and file path fixes.