Final fixes to array conversion