Upgrade dependencies and fix for latest userman changes.