Two previously undiscussed situations

Practicing before nationals, we weren't sure what our agreements were after:

1.

(1S)-P-(P)-1N
( X)-?

Where X is just cards.

For simplicity, we decided just to play the same system we would after 1N-(X) showing cards, too. (In our case, P is to play, XX is 1 minor or both majors, 2m is that suit and a higher, and 2M is natural.)

Does anyone have a better idea?

2.

1S-(2N)-X-(4C)

Normally after we double their 2 suited bids, subsequent doubles are penalty by either player. But then does that mean we're in a forcing auction? Seems pretty awkward to treat it that way.

Really once they jump, I think takeout by opener and cards by responder is best.