Fixes for nested objs in array elements