Minor fixes to MAC