Minor fixes and moves.