Tiny Sprint 42 Fixes

Fixes for #8379, #8427, #8428 and #8430.