Fix itervalues
Fix keys and maps