Misc. hotfixes for UAT issues