Fixed some dependency problems.