Reorder some config overrides in serve mode

Not a particularly happy with this solution, I think serve mode needs a careful re-examination now that the way configs are obtained has changed so drastically. But it does fix the problem.
Fixes #93.