Fixing case issues