Updating code to fix Swift Array warnings and fixing compile errors as p...

...art of XCode Beta 3 update