Did I get too passive on these two hands?

Hand 1 - The PF call isn't normal for me but 7-handed with three limpers I figured what the hell. I didn't push over the river reraise because it seemed like it might be a donkish JT.

POKERSTARS GAME #5101336020: HOLD'EM NO LIMIT ($0.25/$0.50) - 2006/05/30 - 17:35:11 (ET)
Table 'Pierretta' 9-max Seat #1 is the button
Seat 1: Rockymv ($48.50 in chips)
Seat 4: WhatTheBallz ($54.90 in chips)
Seat 5: cariadon ($89.80 in chips)
Seat 6: golfinn3 ($50.65 in chips)
Seat 7: Sly1575 ($52.65 in chips)
Seat 8: jakeman ($12.70 in chips)
Seat 9: Sick Chimp ($32 in chips)
WhatTheBallz: posts small blind $0.25
cariadon: posts big blind $0.50
*** HOLE CARDS ***
Dealt to Rockymv [5h Ah]
golfinn3: folds
Sly1575: calls $0.50
jakeman: calls $0.50
Sick Chimp: calls $0.50
Rockymv: calls $0.50
WhatTheBallz: calls $0.25
cariadon: checks
*** FLOP *** [6s Th 7h]
WhatTheBallz: checks
cariadon: checks
Sly1575: checks
jakeman: checks
ELA57 joins the table at seat #3
Sick Chimp: checks
Rockymv: checks
*** TURN *** [6s Th 7h] [Tc]
WhatTheBallz: checks
cariadon: checks
Sly1575: checks
jakeman: checks
Sick Chimp: checks
Rockymv: checks
*** RIVER *** [6s Th 7h Tc] [Jh]
WhatTheBallz: checks
cariadon: checks
Sly1575: bets $2.50
jakeman: folds
Owly joins the table at seat #2
Sick Chimp: folds
Rockymv: raises $5 to $7.50
WhatTheBallz: folds
cariadon: folds
Sly1575: raises $5 to $12.50
Rockymv: calls $5

Hand 2 - Call, raise or push the river?

POKERSTARS GAME #5101385386: HOLD'EM NO LIMIT ($0.25/$0.50) - 2006/05/30 - 17:40:30 (ET)
Table 'Enif V' 9-max Seat #7 is the button
Seat 1: pacman1978 ($15.50 in chips)
Seat 2: Rockymv ($50 in chips)
Seat 3: PilsenKid ($82.80 in chips)
Seat 4: nastyned420 ($32.75 in chips)
Seat 5: zoli_star ($72.60 in chips)
Seat 6: Kingcovey ($76.20 in chips)
Seat 7: ToddLOW ($38.45 in chips)
Seat 8: Sick Chimp ($67.25 in chips)
Seat 9: KCxx ($52.05 in chips)
Sick Chimp: posts small blind $0.25
KCxx: posts big blind $0.50
*** HOLE CARDS ***
Dealt to Rockymv [4s 4h]
pacman1978: folds
Rockymv: calls $0.50
PilsenKid: folds
nastyned420: folds
zoli_star: folds
Kingcovey: folds
ToddLOW: folds
Sick Chimp: calls $0.25
KCxx: checks
*** FLOP *** [8s 5h 4d]
Sick Chimp: checks
KCxx: bets $1.50
Rockymv: raises $3 to $4.50
Sick Chimp: folds
KCxx: calls $3
*** TURN *** [8s 5h 4d] [Kc]
KCxx: checks
Rockymv: bets $8
KCxx: calls $8
*** RIVER *** [8s 5h 4d Kc] [As]
KCxx: bets $4
Rockymv: calls $4

#2, there is no way I call that river. Raise.

I push #2 foh sho.

Hand #1 - I raise it to $25 on the river. If he pushes over that I think long and hard about folding, but I probably can't.

Hand #2 - You're only beat by 96, 63, 23 or a higher set... all possible out of the BB, but like the first hand, I don't think you're maximizing value by calling the river. I raise to around $15.

Hand #1:Bet flop.You have the nut FD and position in a passive pot.Bet so that if you hit on the turn there is money.Noone will pay off a small pot when the flush hits.

Turn is ok.

River:Just call.

Hand #2: Looks of to me.I call river as well.

1) You're worried about JT on the river, even though he didn't bet the turn when he ostensibly made trips? I'm pushing the river here, I think an underflush is much more likely given the action.

2) Raise river--try to get it all in.