fixup: adds ARRAY_SIZE(x) to Util.h and use it instead of sizeof