Avoid some "unused" warnings during compilation
Merge pull request #451 from stamfest/small-fixes

small fixes