fixes and restarts