Some minor changes on templates and messages.