Minor changes to get build working again on latest OSX 10.9.