Various HU collaborative bugfixes.