Serialization fixes and preset support