Fixes on Mac