Fixed messages on init and upgrade