This commit fixes some bugs on example apps