c2105/taoshan: several changes