Fix OSX project + cleaning