Minor tweaks.

Small changes across the board.