Update typeMap following merge from upstream