v0.7.2 improvements from cschiff