Fix Hub serialisation issues.