Fixes for 1.6.1 (new pull request)

See #1325