Fix some dependencies issues