Some more fixes (xBR mlv4)