Fix case stuff