Fixed bugs #2202 and #2203.
Merge pull request #2204 from JoeyJo0/minor_tcomm_fixes

Fixed bugs #2202 and #2203.