small fixes #6