Add missing type contexts