Fixed some minor problems with the storage not matching an array.
Merge remote-tracking branch 'origin/master'