Correct defaults population of options