Fixing some dependency problems.