Add most of the missing target types