Removal of a few raw type warnings