Minor refinements across the board