Remove useless namegen thunk
Remove some warnings