Small corrections and fixes.