Tiny Sprint 42 Fixes

Fixes for #8379, #8427 and #8428.