Small changes to fix for real dependancies :D