Fixes and Enhancements from the tracker

See individual commits for more a more fine-grained summary.

Closes #1620 #1625 #1626 #1635 and #1597