Fix a series of issues for demonstration

Just a number of fixes. Some need to be revisited, but this commit also
includes some changes that I wanted to do anyway.

Signed-off-by: Konrad Reiche <konrad.reiche@gmail.com>