Little improvements for admin commands