Final fix to get branch switching working.