Several fixes to get app to load.
Versioning