Fixed dependencies issues