more updates for language/tooling changes