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

Small fixes.