Fix more array issues for 5.3 compat