Fix a couple bugs I put in before.