Fixed few things.

Fixed few things.