bug fixing for rebased rust parts, etc.