Fix a couple oddities