small fixes #8