fixing some dependency issues