Minor fixes / cleanup
Preparation for shared codebase with PRO - bug fixes - admin helper