Final fixups. Now distcheck works.