Additional cleanup for Mavericks