Initial Patch 2.4 fixes

Still todo: Resistances.