More loopy-triggered preamble gen fixes