More work towards better redirecting