several fixes
Merge branch 'gfate-intergration' of https://github.com/Chiel92/fate into gfate-intergration
quick fix for ui.activate