A few minor adjustments to allow for deployment on 10.6.8