Fixed case issues