Small fixes in Condition checking.