Stop aggreagtors on completion, small fixes