Fixes for UAT runner