TIMOB-12651 Addressing issues that slipped past first pull requests.