MAB fixes