Fixes by Roman's review.