A few more fixes to make the framework compatible with Mac OS X 10.7.