fix errors found in demo2.0 branch