Fixes to namespace errors, extra MPC facilities