Minor fixes, restart on death