Adminotech bugfixes pt. 8

Commits so far. No rush to merge to core from our end, just wanted to prep this branch to working condition.