Responsiveness fixes