Bug 16701: (follow-up) improve some changes