Fixed issues with restarts and updates.