Fix a couple of bad things