Mavericks build fixes.