Admin check fixes