fixes for demo