Some more Mac fixes