utils vs util typo
Fix various bugs