Fixed small warnings from first attempt at Mac OS port