slight modifications to work with new version of stacksync-commons