Doing the merge from OSX improvements