Small updates for MarLIN2