Fix some problems using Uppercase in some fields