More MBP fixes