Bug Fixes

Fixed issue in the SPH that prevented the MCM/MBU from switching types.