Update with minor fixes due to switch inst