Reintroduce some restart things