Minor fixes.
Merge pull request #203 from Gizra/Gizra-198

Minor fixes.