mostly builds on macos again