os x stuff fixed