Updated for Mavericks builds