fixes for Mavericks