MacOS project fixes