macosx: more compile fixes