Additional serialisation fIxes.