Some changes forgotten in previous commit