Fixed some dependency conflicts.