Fix up some issues that Frances found