Tidy up MAC mismatching