Fix some more messages, improve crash handling