Misc pre-branch switching changes