Apply further fixes from Ron.
1 file changed