fixed scope corrections
for now, don't allow key fields to be None