fix #706 and other mirror improve