Fix custom option defaults not merging correctly