Some fixes to potus demo (#7749)

Change-Id: I61b80e8610431988ae3bd6a88993b010d116db4e