more fixes for demo