Various Mavericks Build Fixes