Polish demo

@Kevinwlee 

2 simple changes, see commit messages.