Fixing closure dependencies