#1: Fix dependency scopes