Fix some responsiveness