Several cosmetic fixes for different areas.
Versioning