diff --git a/src/zutil/algo/sort/QuickSort.java b/src/zutil/algo/sort/QuickSort.java
index 011a0b1..1f8bfb7 100644
--- a/src/zutil/algo/sort/QuickSort.java
+++ b/src/zutil/algo/sort/QuickSort.java
@@ -43,7 +43,7 @@ public class QuickSort{
      * @param stop is the index to stop
      * @param type is the type of pivot to use
      */	
-	@SuppressWarnings("unchecked")
+	@SuppressWarnings({ "unchecked", "rawtypes" })
 	public static void sort(SortableDataList list, int start, int stop, int type, boolean insertionSort){
 		if(stop-start <= 15 && insertionSort){
 			SimpleSort.insertionSort( list, start, stop);
@@ -76,7 +76,7 @@ public class QuickSort{
 
 	}
 
-	@SuppressWarnings("unchecked")
+	@SuppressWarnings({ "unchecked", "rawtypes" })
 	private static int pivot(SortableDataList<?> list, int start, int stop,int type){
     	switch(type){
     		case RANDOM_PIVOT:
diff --git a/src/zutil/algo/sort/Randomizer.java b/src/zutil/algo/sort/Randomizer.java
index 0e29caa..85ca938 100644
--- a/src/zutil/algo/sort/Randomizer.java
+++ b/src/zutil/algo/sort/Randomizer.java
@@ -14,7 +14,7 @@ public class Randomizer {
 	 * Randomizes the index of all the elements
 	 * @param list The list
 	 */
-	@SuppressWarnings("unchecked")
+	@SuppressWarnings({ "rawtypes" })
 	public static void sort(SortableDataList list){
 		int size = list.size();
 		for(int i=0; i<size ;i++){
diff --git a/src/zutil/converters/Converter.java b/src/zutil/converters/Converter.java
index 19ffa6a..1b6ba93 100644
--- a/src/zutil/converters/Converter.java
+++ b/src/zutil/converters/Converter.java
@@ -97,9 +97,8 @@ public class Converter {
 	 * @param interf the interface to look for
 	 * @return true if the interface is implemented else false
 	 */
-	@SuppressWarnings("unchecked")
-	public static boolean isInstanceOf(Object object, Class interf){
-		Class[] objectInterf = object.getClass().getInterfaces();
+	public static boolean isInstanceOf(Object object, Class<?> interf){
+		Class<?>[] objectInterf = object.getClass().getInterfaces();
 		for(int i=0; i<objectInterf.length ;i++){
 			if(objectInterf[i] == interf){
 				return true;
diff --git a/src/zutil/network/nio/worker/grid/GridClient.java b/src/zutil/network/nio/worker/grid/GridClient.java
index 29bc9b3..846f56c 100644
--- a/src/zutil/network/nio/worker/grid/GridClient.java
+++ b/src/zutil/network/nio/worker/grid/GridClient.java
@@ -17,6 +17,7 @@ import zutil.network.nio.worker.WorkerDataEvent;
  * 
  * @author Ziver
  */
+@SuppressWarnings({ "unchecked", "rawtypes" })
 public class GridClient extends ThreadedEventWorker {
 	private static LinkedList<GridJob> jobQueue;
 	private static GridThread thread;
@@ -43,7 +44,7 @@ public class GridClient extends ThreadedEventWorker {
 	 */
 	public void initiate() throws IOException{
 		network.setDefaultWorker(this);
-		network.send(new GridMessage<Object>(GridMessage.REGISTER));
+		network.send(new GridMessage(GridMessage.REGISTER));
 
 		for(int i=0; i<Runtime.getRuntime().availableProcessors() ;i++){
 			Thread t = new Thread(thread);
@@ -55,14 +56,14 @@ public class GridClient extends ThreadedEventWorker {
 	public void messageEvent(WorkerDataEvent e) {
 		// ignores other messages than GridMessage
 		if(e.data instanceof GridMessage){
-			GridMessage<?> msg = (GridMessage<?>)e.data;
+			GridMessage msg = (GridMessage)e.data;
 			switch(msg.messageType()){
 			// Receive data from Server
 			case GridMessage.INIT_DATA:
 				thread.setInitData(msg.getData());
 				break;
 			case GridMessage.COMP_DATA:
-				jobQueue.add(new GridJob(msg.getJobQueueID(), (Queue<?>)msg.getData()));
+				jobQueue.add(new GridJob(msg.getJobQueueID(), (Queue)msg.getData()));
 				break;
 			}
 		}
@@ -78,9 +79,9 @@ public class GridClient extends ThreadedEventWorker {
 	 */
 	public static void jobDone(int jobID, boolean correct, Object result) throws IOException{
 		if(correct)
-			network.send(new GridMessage<Object>(GridMessage.COMP_SUCCESSFUL, jobID, result));
+			network.send(new GridMessage(GridMessage.COMP_SUCCESSFUL, jobID, result));
 		else
-			network.send(new GridMessage<Object>(GridMessage.COMP_INCORRECT, jobID, result));
+			network.send(new GridMessage(GridMessage.COMP_INCORRECT, jobID, result));
 	}
 
 	/**
@@ -91,7 +92,7 @@ public class GridClient extends ThreadedEventWorker {
 	 */
 	public static void jobError(int jobID){
 		try{
-			network.send(new GridMessage<Object>(GridMessage.COMP_SUCCESSFUL, jobID));
+			network.send(new GridMessage(GridMessage.COMP_SUCCESSFUL, jobID));
 		}catch(Exception e){e.printStackTrace();}
 	}
 
@@ -101,7 +102,7 @@ public class GridClient extends ThreadedEventWorker {
 	 */
 	public static synchronized GridJob getNextJob() throws IOException{
 		if(jobQueue.isEmpty()){
-			network.send(new GridMessage<Object>(GridMessage.NEW_DATA));
+			network.send(new GridMessage(GridMessage.NEW_DATA));
 			while(jobQueue.isEmpty()){
 				try{Thread.sleep(100);}catch(Exception e){}
 			}
diff --git a/src/zutil/network/nio/worker/grid/GridServerWorker.java b/src/zutil/network/nio/worker/grid/GridServerWorker.java
index 79b60e8..c4b7487 100644
--- a/src/zutil/network/nio/worker/grid/GridServerWorker.java
+++ b/src/zutil/network/nio/worker/grid/GridServerWorker.java
@@ -14,18 +14,18 @@ import zutil.network.nio.worker.WorkerDataEvent;
  * 
  * @author Ziver
  */
-
+@SuppressWarnings({ "unchecked", "rawtypes" })
 public class GridServerWorker extends ThreadedEventWorker{
 	// Job timeout after 30 min
 	public static int JOB_TIMEOUT = 1000*60*30;
 
 	private HashMap<Integer, GridJob> jobs; // contains all the ongoing jobs
 	private Queue<GridJob> reSendjobQueue; // Contains all the jobs that will be recalculated
-	private GridJobGenerator<?> jobGenerator; // The job generator
-	private GridResultHandler<Object> resHandler;
+	private GridJobGenerator jobGenerator; // The job generator
+	private GridResultHandler resHandler;
 	private int nextJobID;
 
-	public GridServerWorker(GridResultHandler<Object> resHandler, GridJobGenerator<?> jobGenerator){
+	public GridServerWorker(GridResultHandler resHandler, GridJobGenerator jobGenerator){
 		this.resHandler = resHandler;
 		this.jobGenerator = jobGenerator;
 		nextJobID = 0;
@@ -41,12 +41,12 @@ public class GridServerWorker extends ThreadedEventWorker{
 		try {
 			// ignores other messages than GridMessage
 			if(e.data instanceof GridMessage){
-				GridMessage<?> msg = (GridMessage<?>)e.data;
+				GridMessage msg = (GridMessage)e.data;
 				GridJob job = null;
 
 				switch(msg.messageType()){
 				case GridMessage.REGISTER:
-					e.network.send(e.socket, new GridMessage<Object>(GridMessage.INIT_DATA, 0, jobGenerator.initValues()));
+					e.network.send(e.socket, new GridMessage(GridMessage.INIT_DATA, 0, jobGenerator.initValues()));
 					break;
 				// Sending new data to compute to the client
 				case GridMessage.NEW_DATA:
@@ -60,7 +60,7 @@ public class GridServerWorker extends ThreadedEventWorker{
 						jobs.put(job.jobID, job);
 						nextJobID++;
 					}
-					GridMessage<Object> newMsg = new GridMessage<Object>(GridMessage.COMP_DATA, job.jobID, job.job);
+					GridMessage newMsg = new GridMessage(GridMessage.COMP_DATA, job.jobID, job.job);
 					e.network.send(e.socket, newMsg);				
 					break;