Mac fixes

Style fixups