Minor changes with redirect