mac & windows project fixes