r08:

- Minor code changes.
- Updated for patch 4.3.0.
