diff --git a/jadx-gui/src/main/java/jadx/gui/treemodel/JNode.java b/jadx-gui/src/main/java/jadx/gui/treemodel/JNode.java
index daedd1ca3..50220a83e 100644
--- a/jadx-gui/src/main/java/jadx/gui/treemodel/JNode.java
+++ b/jadx-gui/src/main/java/jadx/gui/treemodel/JNode.java
@@ -10,7 +10,7 @@ import javax.swing.Icon;
 import javax.swing.tree.DefaultMutableTreeNode;
 
 public abstract class JNode extends DefaultMutableTreeNode {
-
+	private static final long serialVersionUID = 1337L; // TODO: Create your own serialvers with serialver/eclipse
 	public static JNode makeFrom(JavaNode node) {
 		if (node instanceof JavaClass) {
 			JClass p = (JClass) makeFrom(node.getDeclaringClass());
diff --git a/jadx-gui/src/main/java/jadx/gui/treemodel/JRoot.java b/jadx-gui/src/main/java/jadx/gui/treemodel/JRoot.java
index a20631a32..2df2355db 100644
--- a/jadx-gui/src/main/java/jadx/gui/treemodel/JRoot.java
+++ b/jadx-gui/src/main/java/jadx/gui/treemodel/JRoot.java
@@ -124,7 +124,7 @@ public class JRoot extends JNode {
 	}
 
 	public JClass searchClassInTree(JClass node) {
-		Enumeration en = this.breadthFirstEnumeration();
+		Enumeration<?> en = this.breadthFirstEnumeration();
 		while (en.hasMoreElements()) {
 			Object obj = en.nextElement();
 			if (node.equals(obj)) {
diff --git a/jadx-gui/src/main/java/jadx/gui/ui/SearchDialog.java b/jadx-gui/src/main/java/jadx/gui/ui/SearchDialog.java
index 96a01eee2..8bd8874fb 100644
--- a/jadx-gui/src/main/java/jadx/gui/ui/SearchDialog.java
+++ b/jadx-gui/src/main/java/jadx/gui/ui/SearchDialog.java
@@ -71,7 +71,7 @@ public class SearchDialog extends JDialog {
 
 	private JTextField searchField;
 	private ResultsModel resultsModel;
-	private JList resultsList;
+	private JList<Object> resultsList;
 	private JProgressBar busyBar;
 
 	public SearchDialog(Frame owner, TabbedPane tabbedPane, JadxWrapper wrapper) {
@@ -171,7 +171,7 @@ public class SearchDialog extends JDialog {
 		}
 	}
 
-	private static class ResultsModel extends DefaultListModel {
+	private static class ResultsModel extends DefaultListModel<Object> {
 		private static final long serialVersionUID = -7821286846923903208L;
 
 		private void setResults(List<JavaNode> results) {
@@ -186,7 +186,7 @@ public class SearchDialog extends JDialog {
 		}
 	}
 
-	private static class ResultsCellRenderer implements ListCellRenderer {
+	private static class ResultsCellRenderer implements ListCellRenderer<Object> {
 		private final Color selectedBackground;
 		private final Color selectedForeground;
 
@@ -197,7 +197,7 @@ public class SearchDialog extends JDialog {
 		}
 
 		@Override
-		public Component getListCellRendererComponent(JList list,
+		public Component getListCellRendererComponent(JList<?> list,
 		                                              Object obj, int index, boolean isSelected, boolean cellHasFocus) {
 			if (!(obj instanceof JNode)) {
 				return null;
@@ -244,7 +244,7 @@ public class SearchDialog extends JDialog {
 		codeChBox.setEnabled(false);
 
 		resultsModel = new ResultsModel();
-		resultsList = new JList(resultsModel);
+		resultsList = new JList<Object>(resultsModel);
 		resultsList.setCellRenderer(new ResultsCellRenderer());
 		resultsList.addMouseListener(new MouseAdapter() {
 			public void mouseClicked(MouseEvent evt) {
diff --git a/jadx-gui/src/main/java/jadx/gui/utils/Link.java b/jadx-gui/src/main/java/jadx/gui/utils/Link.java
index 033b59e93..cc29cc60f 100644
--- a/jadx-gui/src/main/java/jadx/gui/utils/Link.java
+++ b/jadx-gui/src/main/java/jadx/gui/utils/Link.java
@@ -18,6 +18,7 @@ import org.slf4j.LoggerFactory;
 import static java.awt.Desktop.Action;
 
 public class Link extends JLabel implements MouseListener {
+	private static final long serialVersionUID = 0L; // TODO: Generate random serialvers with serialver/eclipse
 	private static final Logger LOG = LoggerFactory.getLogger(JLabel.class);
 
 	private String url;