fixes for install tokens handling'