Fix some message inconsistencies