Some more fixes for distcheck.