More message improvements