Marbawi fixes