Fixes for /restart

Now restart works properly, yay