Added some fixes for Multidimensional Arrays