diff --git a/src/zutil/network/torrent/Torrent.java b/src/zutil/network/torrent/Torrent.java
index ce8eda4..3cfcf70 100644
--- a/src/zutil/network/torrent/Torrent.java
+++ b/src/zutil/network/torrent/Torrent.java
@@ -63,7 +63,7 @@ public class Torrent {
 		created_by = (String)dataMap.get("created by");
 		main_tracker = (String)dataMap.get("announce");
 		tracker_list = (ArrayList<String>)dataMap.get("announce-list");
-		info_hash = (HashMap)dataMap.get("info");
+		info_hash = (HashMap<String, Object>)dataMap.get("info");
 		is_private = (((Integer)dataMap.get("private")) != 0);
 	}
 	
diff --git a/src/zutil/network/torrent/TorrentParser.java b/src/zutil/network/torrent/TorrentParser.java
index 4b8041b..ebb5f99 100644
--- a/src/zutil/network/torrent/TorrentParser.java
+++ b/src/zutil/network/torrent/TorrentParser.java
@@ -75,7 +75,7 @@ public class TorrentParser {
 		case 'l':
 			//System.out.println("Found List at "+index);
 			data.deleteCharAt(0);
-			LinkedList list = new LinkedList();
+			LinkedList<Object> list = new LinkedList<Object>();
 			c = data.charAt(0);
 			while(c != 'e'){
 				list.add(decode_BEncoded(data));
@@ -94,7 +94,7 @@ public class TorrentParser {
 		case 'd':
 			//System.out.println("Found Dictionary at "+index);
 			data.deleteCharAt(0);
-			HashMap map = new HashMap();
+			HashMap<Object,Object> map = new HashMap<Object,Object>();
 			c = data.charAt(0);
 			while(c != 'e'){
 				Object tmp2 = decode_BEncoded(data);