Mavericks work arounds