Minor fixes #1917