Fixes, cleanups, and MassiveCore update