Bump dependencies
a few minor fixes.