More 'distcheck' fixes