A few fixes from upgrading OSX