Minor changes to improve responsiveness.