procd: backport fixes from master branch