fixed some dependencies issues in control