Responsiveness bug fixes