74523b0 last round of fixes for today