Some responsiveness fixes