Post mutagen 1.22 fixes.