Fixed some if-logic issues introduced earlier today

Hopefully the last minor update for today!