Cleanups to handle GEO better, and also files without imagery