Fix/Improve various messages