Issue #1641. More redirect fixes