Mac OS Fixes