Fix Comment block, and if18 constant