Fixes on admin part