CLEANUP: Fix comp warnings