macosx: fixed regressions from merges with the 1.0-bugfix branch