Changes to run on my Mac OS X 10.6 machine