Minor fixups on the sweeper