A variety of changes not picked up by previous committs