Some more responsive fixes.