BUG-FIX: Some resources had bad dependencies