Further Linux vs OSX adjustments.