diff --git a/CS2JLibrary/src/RusticiSoftware/JavaSupport/reflect/FieldSupport.java b/CS2JLibrary/src/RusticiSoftware/JavaSupport/reflect/FieldSupport.java
index ccd26ab..7c6ea95 100644
--- a/CS2JLibrary/src/RusticiSoftware/JavaSupport/reflect/FieldSupport.java
+++ b/CS2JLibrary/src/RusticiSoftware/JavaSupport/reflect/FieldSupport.java
@@ -24,11 +24,10 @@ import java.lang.annotation.Annotation;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 
-import javax.swing.text.html.HTMLDocument.HTMLReader.IsindexAction;
 
 public class FieldSupport {
 
-	public static Annotation[] getAnnotations(Field f, Class filterBy, boolean inherits)
+	public static Annotation[] getAnnotations(Field f, Class<?> filterBy, boolean inherits)
 	{
 		ArrayList<Annotation> filteredAnns = new ArrayList<Annotation>();
 		
diff --git a/CS2JLibrary/src/RusticiSoftware/JavaSupport/util/LocaleSupport.java b/CS2JLibrary/src/RusticiSoftware/JavaSupport/util/LocaleSupport.java
index ef6509e..963b773 100755
--- a/CS2JLibrary/src/RusticiSoftware/JavaSupport/util/LocaleSupport.java
+++ b/CS2JLibrary/src/RusticiSoftware/JavaSupport/util/LocaleSupport.java
@@ -31,14 +31,14 @@ public class LocaleSupport {
 	// singleton
 	private LocaleSupport() {}
 	
-	private static ThreadLocal threadLocal = new InheritableThreadLocal();
+	private static ThreadLocal<Locale> threadLocal = new InheritableThreadLocal<Locale>();
 
 	public static void setCurrentLocale(Locale locale) {
 		threadLocal.set(locale);
 	}
 
 	public static Locale getCurrentLocale() {
-		Locale locale = (Locale) threadLocal.get();
+		Locale locale = threadLocal.get();
 		
 		if (locale == null) {
 			return Locale.getDefault();
diff --git a/CS2JLibrary/src/RusticiSoftware/System/EnumSupport.java b/CS2JLibrary/src/RusticiSoftware/System/EnumSupport.java
index a001c1a..9be6652 100755
--- a/CS2JLibrary/src/RusticiSoftware/System/EnumSupport.java
+++ b/CS2JLibrary/src/RusticiSoftware/System/EnumSupport.java
@@ -23,12 +23,12 @@ package RusticiSoftware.System;
 public class EnumSupport {
 
 	// returns true iff v is a valid ordinal position of a enum in e
-	public static boolean isDefined(Class e, int v)
+	public static boolean isDefined(Class<?> e, int v)
 	{
 		return (v >= 0 && v < e.getEnumConstants().length);
 	}
 	
-	public static String toString(Enum e, String m)
+	public static String toString(Enum<?> e, String m)
 	{
 		if ("D".equals(m))
 		{