Fixing install and update bugs