More quick fixes

Fixes #1723 #1671.

Partially addresses issue #1718.