diff --git a/src/input_xml.F90 b/src/input_xml.F90
index dab02f52bc..716a89361a 100644
--- a/src/input_xml.F90
+++ b/src/input_xml.F90
@@ -2258,6 +2258,8 @@ contains
           call write_message("Maximum neutron transport energy: " // &
                trim(to_str(energy_max(NEUTRON))) // " eV for " // &
                trim(adjustl(nuclides(i) % name)), 7)
+          if (master .and. energy_max(NEUTRON) < 20.E6) call warning("Maximum &
+               &neutron energy is below 20 MeV. This may bias the results.")
           exit
         end if
       end if
@@ -2272,9 +2274,10 @@ contains
           exit
         end if
       end do
-      if (.not. mp_found) call warning("Windowed multipole functionality is &
-           &turned on, but no multipole libraries were found. Make sure that &
-           &windowed multipole data is present in your cross_sections.xml file.")
+      if (master .and. .not. mp_found) call warning("Windowed multipole &
+           &functionality is turned on, but no multipole libraries were found. &
+           &Make sure that windowed multipole data is present in your &
+           &cross_sections.xml file.")
     end if
 
     call already_read % clear()
diff --git a/src/nuclide_header.F90 b/src/nuclide_header.F90
index 296a4a6a27..fe35f72930 100644
--- a/src/nuclide_header.F90
+++ b/src/nuclide_header.F90
@@ -685,8 +685,8 @@ contains
 
   subroutine nuclide_init_grid(this, E_min, E_max, M)
     class(Nuclide), intent(inout) :: this
-    real(8), intent(in) :: E_min           ! Minimum energy in MeV
-    real(8), intent(in) :: E_max           ! Maximum energy in MeV
+    real(8), intent(in) :: E_min           ! Minimum energy in eV
+    real(8), intent(in) :: E_max           ! Maximum energy in eV
     integer, intent(in) :: M               ! Number of equally log-spaced bins
 
     integer :: i, j, k               ! Loop indices