Issue #32: tiny bugfixes [ci skip]