fixing some case issues in advance