various messages fixes