Minor updates for responsiveness