Backport various improvements from completed sites