Quick fixes (again)