Fixes for make dist
Bump version to 1.6.1