Fix bugs found by demo