Fixes dependencies issues