Small updates, ref #1360
Merge pull request #1362 from EPuncker/master

Small updates, ref #1360