Message system unified; Minor fixes; Warning clean