Fix array warnings and add quotes