Sis fixes

This finally fixes `sure_independence_screen` so that it behaves like the legacy function in `setup_driver`. @tonglu