Dependency update and big fixes