Fix raw type warnings again