Added Generics for a couple of things

Just cleared up a few things that bothered me.