small fixes in restart