Fixes with awk and upper case