Fix a couple case issues