Fix a few typos
Swap a few instances of default/server uses

Issue US320