Minor fixes; consider it as 1.7.1 release