Fixups for 'make dist'