Mavericks Build Fixes