Minor clean-ups.
OSX 10.6 compatibility fix.