Fix comparators
Fix Console compiler errors