Changes for mavericks workingness