Fixed a FoundBug. Unified Utils classes.