Mac Build Fixes