Working on fix for install and auto-updates