Some more fixes from Lars' comments.