Fix options extending so they don't modify original defaults