Small fixes for v1.7