Issue #3: admin fixes