Fix generics warnings
Add missing transitive dependencies