Path fixes and updates to .osx