Some little fixes and MPC < 1.0 fixes, for Travis