Router fix, mail fix