Yet more responsive fixes.