Resolve dependency issues with local/global API