small fixes on #17