[CLEANUP] Validation warnings and errors