Fixing Mac inonsistencies