Some admin fixes
Fix event name formatting a bit