More updates based on testing with Mavericks