Minor messages changes