Issue #81 - compile fixes(?) for recent OS X/Xcode