Multi-Array fixes [ci skip]