Fixed Admin issues