Add some checks for super-user