Many small changes that break earlier usage