TISTUD-3106: fixed the couple of issues Clayton saw.