Fix mac project issues
Fix iOS issues