More array fixes.