another bunch of fixes for score/witness cross-links