Second round of bug fixes on scene serialisation