Array patched template fixes (recent regression)