[stacktraces] fixes for spotted bugs while preparating demos

Change-Id: Ic220339ce23c0224dfdf8724d7298f826a45a4bf