committing some fixes on the pax side and admin side