fixes for demo presentation