Remove raw type warnings