v1.7 minor bug fixes. Code cleanup.

Fixed issue when deploying in Release mode to physical device, app would crash upon startup.