Dependency updates + few code fixes