Dependency bumps, fixed small code issues