Fixed some hard dependencies