Some small fixes for the demo