Several msgs fixed