More array fixes