few fixes for demo