Few quick bug fixes, some notes for Admin method renames