Minor corrections and neatening.
Fix for transient on start up.