Distribution bugfixes.