Fix raw type warnings