Easy Fixes, Batch 1

Fixes for #1723, #1783, #1785, and #1807