Hide super hack
Some GType fixes