Warnings/Generics fixes