build: fix more Mac-OS compilation issues.