More fixes.
Fixing some fixes.
Merge pull request #53 from ernstchan/minor-changes

Minor changes