Adjustments for OS X but doesn't quite work...