Fix a few errors due to missing includes and function calls in default assignments
Client fix for uppercase special characters