minor fixes for demo