Mac stuff fixed