Bugs fixing

TDIS-7320, TDIS-7398, TDIS-7485