Fix and improve admin-scripts