Fix default command line options
Fixup requests through user-supplied code