Update with styleguide fixes and 4.2 additions