Switchmaster General's patches