Fix Case Issues