Merge pull request #524 from metamx/fix-router2

Small fixes to router