Fixed up the projects after latest update.
Also some had merged very badly and I'd not noticed.