Admin tools + fix