Some Tag Type hinting fixes