Connect fixes
Merge branch 'develop' of https://github.com/electricalwind/NameNotFound into develop