Fixes for arrays