fixes for Switchboard