Modify Top.Type
Remove warnings