more array fixes