Fix options serialization