Fix case sensitive problems