Fixed some dependency issues