Fix tiny bugs for demo purpose.