Change mac project as well and clean up some warnings