Superuser fixes take 2