Bug fixes related to RW updates and WelcomeTip