OS X Linearization fixes