Fixed the compiler warnings for the mac build with the suggestions by Kevin