TISTUD-5060 TISTUD-5101 Fix two bugs found during my demo