Mavericks fixes