Bug fixes.
Added __gtype_name__s