Minor fixups.
Merge pull request #2 from opichals/minor-fixups

Minor fixups