Fixed minor serialisation issues