Adjustments to make things also work on Mac