Fix and/or logic.
Add ETC variable checks.