fix various bugs for v1.10