Array fixes
Merge pull request #5154 from GrahamCampbell/4.2-arr

[4.2] Array Fixes