improve standalone runnability as noted in #63