Fix potential dictionary curruption issue when manual overrides are passed in