Small fixes

Applies to: Gecko + Balboa A round of small fixes for a more reliable experience. Nothing to do on your end.