Fix some messages

Addresses BUKKIT-5272, BUKKIT-5282, and BUKKIT-5183