Fixing issues.

Fixed minor issues.