Try to fix dependencies issues