Update some dependencies

See commit summaries for specifics