Further mavericks revisions