fixed some rawtype warnings