Fixing defaults for controls