Fix restartion, fix logging on destroy