Fix dependency scope and missng dependency