Fixed raw usage of generics that threw a warning in compile