more fixes for scripts changes, issue #2