Cleared up some autoboxing errors.