Fixes to array field and address field