some dependence fixes