Fixes for make dist and make distcheck