Fixed merging issues with Utils