minor tweaks trying to get macos working again