Small fixes for better experience.