Fixes to use make dist