Fix some additional warnings on MacOS