Marconi, SWEEP: minor bug fixes