A few corrections for latest build.