Merge fixes made by Crisu83 and others on Crisu83/yiistrap repo

Merge fixes made by Crisu83 and others on Crisu83/yiistrap repo.