Minor fixes for TISTUD-5101 and TISTUD-5060