CLEANUP: Comp warnings