Fixes for make dist.
Merge pull request #334 from joachimmetz/distfixes

Distfixes