Fix new dependency changes