Applying optimizations from linux build