Fixed some case issues