Fixes to new multi fields