Fixing errant/sloppy variable misassignments