various fixes from previous commits for field renames and default value changes