Fix some messages, and some exceptions