CLEAN: Fix comp warnings