Fixes

Fixes for 1772, 1668, and 1752.