Tweaks to make make distcheck work.