Fixed some dependencies
making it into the elcodi team