Misc updates - includes MassiveCore fix