Incremental changes towards getting admin add-on, and LockIt, to work.