3207# Fix a couple logical errors