Add missing types, to ease run without millstone