a couple of fixes for UAT issues