Some fixes for Mavericks and typos.