Fixes #736
Fixes #781
Merge pull request #782 from delving/13.01-small-fixes

13.01 small fixes