still more random mac fixes