Fixed some redirecting