R7.2 - Minor Tweeks