Merge "Fix OSX breakage"