Styling bag of goodies

@jedp - some styling fixes from the b2g merge. 4 commits, 3 issues.