Adjustments needed to adopt code changes from forked flapdoodle.process repo