mb last fixes