changes to permit a 64 bit build on OS X of 2.x