Some mac related changes