Fixed switcher & other things