Fixes from OSX