COMP: Warning cleanup