Minor tweaks that may help server mode