Some warning/compile fixes for MacOS.