Some fixes following comments.