Small fixes and corrections

Applies to: Gecko + Balboa A round of small corrections for a smoother experience.