Fixes for make dist and distcheck