Solved bugs in repository demos

Change-Id: I7571ad9f7e8506082787802e2c411e992c055a78