Fix rawtype compiler warnings found when compiling with JDK7