Small fixes for 1.7 release