Small fixes.
Merge pull request #1 from scholer/master

Small fixes.