Adding Mac / BIP specific stuff