Fix case issues