small fixes per Wangxin's comment