qa fixes on macos