Change the warnings displayed.
Some minor fixes.
More minor changes.