Fixes for make dist