Switch bug fixes still coming!