End of Thursday: assorted changes to get to build