Fixes from review with Loek.