Fix bug in server cleanup of exec context