Player kill fixes/cleanups