Minor message improvements