fix: more dict comprehension fixes