Fixes for 'make dist'