Updated copyright headers and removed certain type-safety warnings from
generics