diff --git a/src/astra/models/astronn_dist.py b/src/astra/models/astronn_dist.py
index 4cbffe8..4831e8e 100644
--- a/src/astra/models/astronn_dist.py
+++ b/src/astra/models/astronn_dist.py
@@ -82,4 +82,4 @@ def apply_flags(self, meta=None, missing_photometry=False, missing_extinction=Fa
             
         return None
 
-print("WARNING: TODO: apply_flags needs properly integrating for astronn_dist")
+#print("WARNING: TODO: apply_flags needs properly integrating for astronn_dist")
diff --git a/src/astra/products/mwm_summary.py b/src/astra/products/mwm_summary.py
index d349719..dbe3921 100644
--- a/src/astra/products/mwm_summary.py
+++ b/src/astra/products/mwm_summary.py
@@ -5,7 +5,10 @@
 from astropy.io import fits
 from astra import __version__
 from astra.utils import expand_path
-from astra.models import Source, ApogeeVisitSpectrum, ApogeeCoaddedSpectrumInApStar, BossVisitSpectrum, BossCombinedSpectrum, ApogeeCombinedSpectrum
+from astra.models.source import Source
+from astra.models.apogee import ApogeeVisitSpectrum, ApogeeCoaddedSpectrumInApStar
+from astra.models.boss import BossVisitSpectrum
+from astra.models.mwm import BossCombinedSpectrum, ApogeeCombinedSpectrum
 from astra.products.utils import (get_fields, get_basic_header, get_binary_table_hdu, check_path)
 
 get_path = lambda bn: expand_path(f"$MWM_ASTRA/{__version__}/summary/{bn}")
diff --git a/src/astra/products/utils.py b/src/astra/products/utils.py
index 63de682..b9c6d39 100644
--- a/src/astra/products/utils.py
+++ b/src/astra/products/utils.py
@@ -5,6 +5,10 @@
     Field,
     Model,
     PostgresqlDatabase,
+    FieldAccessor,
+    JOIN,
+)
+from astra.fields import (
     TextField,
     FloatField,
     BooleanField,
@@ -13,10 +17,9 @@
     BigIntegerField,
     ForeignKeyField,
     DateTimeField,
-    FieldAccessor,
     BigBitField,
-    JOIN
 )
+from astra.models.fields import BasePixelArrayAccessor
 try:
     from playhouse.postgres_ext import ArrayField
 except:
@@ -29,7 +32,6 @@
 from astra import __version__
 from astra.utils import log, flatten, expand_path
 from astra import models as astra_models
-from astra.models.fields import BitField, BasePixelArrayAccessor
 from typing import Union
 from astra.glossary import Glossary