COMP: bug fixes