Corrections for MB 3.0.0 Client code