fix bugs for EB v1.11