Fix more SetupWrapperOptions/TODOs