Fix depedencies problems