Wrapping up minor changes before branching