Fixes to the gee switch