Fixes on generate admin
Fixes on generate admin
Fixes on generate admin