Fixed dependeny issues