More responsiveness improvements