Correct some error for the demonstation platform