Update dependencies, standardize utils