Fixed some deps issues