Some adjustments from review with Loek.