diff --git a/base/compiler/inferencestate.jl b/base/compiler/inferencestate.jl
index 2f701aa4de9e2..4caf6b61ec810 100644
--- a/base/compiler/inferencestate.jl
+++ b/base/compiler/inferencestate.jl
@@ -88,7 +88,7 @@ mutable struct InferenceState
         end
 
         min_valid = src.min_world
-        max_valid = src.max_world == (typemax(UInt)%Int) ?
+        max_valid = src.max_world == typemax(UInt) ?
             get_world_counter() : src.max_world
         frame = new(
             params, result, linfo,
diff --git a/base/compiler/typeinfer.jl b/base/compiler/typeinfer.jl
index 023e1a2ebe61d..857857ae471cc 100644
--- a/base/compiler/typeinfer.jl
+++ b/base/compiler/typeinfer.jl
@@ -61,8 +61,8 @@ function typeinf(frame::InferenceState)
     for caller in frames
         caller.min_valid = min_valid
         caller.max_valid = max_valid
-        caller.src.min_world = min_valid % Int
-        caller.src.max_world = max_valid % Int
+        caller.src.min_world = min_valid
+        caller.src.max_world = max_valid
         if cached
             cache_result(caller.result, min_valid, max_valid)
         end
diff --git a/src/jltypes.c b/src/jltypes.c
index 9b15b2cbf47bb..126500b01cd4d 100644
--- a/src/jltypes.c
+++ b/src/jltypes.c
@@ -2101,8 +2101,8 @@ void jl_init_types(void) JL_GC_DISABLED
                                 jl_any_type,
                                 jl_any_type,
                                 jl_any_type,
-                                jl_long_type,
-                                jl_long_type,
+                                jl_ulong_type,
+                                jl_ulong_type,
                                 jl_bool_type,
                                 jl_bool_type,
                                 jl_bool_type,