save button fix/Mac OS X build fix