Update some dependencies

See commit messages for specifics