More fixes.

Fixee byciclee yipee.