SDK: fix some Generics warnings