Various fixes,
object serialisation