setup fixes for demo