Fixes on admin class