Minor fixes

Minor cleanup across the board.