minor fixes #938