Quick fixes with dependencies