Fix a couple of goofs