Generics warning fixes.