Corrections following Jim's review