Update dependencies and tweak coercion