Minor adjustments suggested by Mark