Fixes to review by Stern