Remove some of the last warnings on MacOS