And yet more responsiveness fixes