Moar MBP fixes