Last work for me from the #mozsprint - more fixes from PR comments