COMP: fixed more issues.