Hotfix on text and few other things..