Small fixes
Release commit (1.7)