Fix additional build warnings due to generics usage