Fix several messages