Fixes for Mavericks