Assorted clean up in endgames