Fixing John's Errors.