fix admin issues
Merge branch 'devel'