update dependencies to better align with upstream