More quick fixes

Fixes #1723 #1671 #1718.