COMP: more bugfixes