etl

8ddf0935 - Array bounds and maybe-uninitialized warning fixes