Made some fix.

Each commit is atomic.