fix some java7 rawtype warnings