Lotsa OSX changes