ARRAY_SIZE fixes and mass deployment