[MK] {other} some more bugfixes