More ua.php fixes

Double-checked some.