Fix some minor warnings

The first patch contains a fix for #124.