Corrections and fixes.