Some more fixed resulting from Jan's comments.