Small changes from the MBpro