Fix dependency issues