Various xmlwalker redirect fixes