BZ-11716: fix some issues