issue #849: A few changes