[HL] fixes for OSX