redirect fixes for v2.2