Serialization & movement fixed.