Fixes at Util.h