Fix few messages