Add osx defaults and some temporary fixes to other files.