Small tweaks to make the user experience a little smoother