Merge small modifications for KEK CSS 3.2.1

I have released KEK CSS 3.2.1 based on CSS 3.2.9 tag. Please merge my small modifications to 3.2.x branch.

Takashi,