Admin Tools Lite update

Adding some fixes from the master branch.