Fix a couple things.