fixes for xdbvsjdb sync