Update dependencies and tweak various things.

A lot of this has been piling up as part of the minecraft branch, for some time now.