Minor adjustments to improve responsiveness