Merge pull request #101 from mithro/small-fixes

Two small fixes