diff --git a/src/constants.F90 b/src/constants.F90
index 6d4d2a0d5..0c208e6d3 100644
--- a/src/constants.F90
+++ b/src/constants.F90
@@ -214,8 +214,8 @@ module constants
 
   ! MGXS Table Types
   integer, parameter :: &
-       ISOTROPIC   = 1, & ! Isotropically Weighted Data
-       ANGLE       = 2    ! Data by Angular Bins
+       MGXS_ISOTROPIC   = 1, & ! Isotropically Weighted Data
+       MGXS_ANGLE       = 2    ! Data by Angular Bins
 
   ! Fission neutron emission (nu) type
   integer, parameter ::   &
diff --git a/src/input_xml.F90 b/src/input_xml.F90
index 81e589630..fde77f498 100644
--- a/src/input_xml.F90
+++ b/src/input_xml.F90
@@ -428,22 +428,7 @@ contains
                &// "' does not exist!")
         end if
 
-        ! Read parameters for spatial distribution
-        if (n < coeffs_reqd) then
-          call fatal_error("Not enough parameters specified for spatial &
-               &distribution of external source.")
-        elseif (n > coeffs_reqd) then
-          call fatal_error("Too many parameters specified for spatial &
-               &distribution of external source.")
-        elseif (n > 0) then
-          allocate(external_source % params_space(n))
-          call get_node_array(node_dist, "parameters", &
-               external_source % params_space)
-        end if
       else
-        call fatal_error("No spatial distribution specified for external &
-             &source.")
-      end if
 
         ! Spatial distribution for external source
         if (check_for_node(node_source, "space")) then
diff --git a/src/mgxs_data.F90 b/src/mgxs_data.F90
index 810908736..f48238afa 100644
--- a/src/mgxs_data.F90
+++ b/src/mgxs_data.F90
@@ -106,22 +106,22 @@ contains
             call get_node_value(node_xsdata, "representation", temp_str)
             temp_str = trim(to_lower(temp_str))
             if (temp_str == 'isotropic' .or. temp_str == 'iso') then
-              representation = ISOTROPIC
+              representation = MGXS_ISOTROPIC
             else if (temp_str == 'angle') then
-              representation = ANGLE
+              representation = MGXS_ANGLE
             else
               call fatal_error("Invalid Data Representation!")
             end if
           else
             ! Default to isotropic representation
-            representation = ISOTROPIC
+            representation = MGXS_ISOTROPIC
           end if
 
           ! Now allocate accordingly
           select case(representation)
-          case(ISOTROPIC)
+          case(MGXS_ISOTROPIC)
             allocate(Nuclide_Iso :: nuclides_MG(i_nuclide) % obj)
-          case(ANGLE)
+          case(MGXS_ANGLE)
             allocate(Nuclide_Angle :: nuclides_MG(i_nuclide) % obj)
           end select
 
@@ -677,17 +677,17 @@ contains
       legendre_mu_points = nuclides_MG(mat % nuclide(1)) % obj % legendre_mu_points
       select type(nuc => nuclides_MG(mat % nuclide(1)) % obj)
       type is (Nuclide_Iso)
-        representation = ISOTROPIC
+        representation = MGXS_ISOTROPIC
       type is (Nuclide_Angle)
-        representation = ANGLE
+        representation = MGXS_ANGLE
       end select
       scatt_type = nuclides_MG(mat % nuclide(1)) % obj % scatt_type
 
       ! Now allocate accordingly
       select case(representation)
-      case(ISOTROPIC)
+      case(MGXS_ISOTROPIC)
         allocate(MacroXS_Iso :: macro_xs(i_mat) % obj)
-      case(ANGLE)
+      case(MGXS_ANGLE)
         allocate(MacroXS_Angle :: macro_xs(i_mat) % obj)
       end select