Fixed dependancy issues