fix some files on 0.30 branch