Fixing upper/lower case issues