Fix dependancy issues