Standardize Utils, fix some problems with UUID support