Fix a bunch of things to make death message changing possible