Minor tweaks all over the place based on GDG comments