bug fixes to option persistence