Detecting and Mitigating Mode-Collapse for Flow-based Sampling of Lattice Field Theories