Finished fixing implicit MSON base types