Fixed a few array and slice issues