More fixes for admin functions, thanks to Piter01