diff --git a/runtime/class_linker.cc b/runtime/class_linker.cc
index 292f830..7912629 100644
--- a/runtime/class_linker.cc
+++ b/runtime/class_linker.cc
@@ -1407,9 +1407,10 @@
     return nullptr;
   }
   Handle<mirror::Array> fields;
-  if (image_pointer_size_ == 8) {
+  if (image_pointer_size_ == 8u) {
     fields = hs.NewHandle<mirror::Array>(mirror::LongArray::Alloc(self, dex_file.NumFieldIds()));
   } else {
+    DCHECK_EQ(image_pointer_size_, 4u);
     fields = hs.NewHandle<mirror::Array>(mirror::IntArray::Alloc(self, dex_file.NumFieldIds()));
   }
   if (fields.Get() == nullptr) {
@@ -5666,7 +5667,7 @@
   ArtField* const parent_field =
       mirror::Class::FindField(self, hs.NewHandle(h_path_class_loader->GetClass()), "parent",
                                "Ljava/lang/ClassLoader;");
-  DCHECK(parent_field!= nullptr);
+  DCHECK(parent_field != nullptr);
   mirror::Object* boot_cl =
       soa.Decode<mirror::Class*>(WellKnownClasses::java_lang_BootClassLoader)->AllocObject(self);
   parent_field->SetObject<false>(h_path_class_loader.Get(), boot_cl);