More fixes: use resolve_type so that enum is interpreted correctly