[MK] {other} bugfixes