Fixes for VMware Fusion builds