More minor changes and fixes.