some fixes
Adjust AppsModel