Yet more distcheck fixes.
Some more fixes for issues found by distcheck