Bump Dependencies and Fixup.