Finished array fixes