Fixes to handling of properties with multiple values