Fix issues that break parsing.
Fix wrong 'OR' condition.