moar fudging, some mac specific