Small fixes for the responsiveness