Fix some if statements, hopefully got taglock fix working.