Switch fixes