Update dependencies

Keep up with upstream