minor fixes to v1.7