[TIMOB-13186] Bug fixes
Merge pull request #121 from bryan-m-hughes/timob-13186

[TIMOB-13186] Bug fixes