Clean up warnings on mac build