small fixes to issue #3