Fixes from roland's review.