Fixed Mac stuff (for now)