Fixes #6321
Fixes #6608
Merge pull request #6737 from comma/conscience

Couple o fixes