Fix the server paths broken after #1 landed