Minor tweaks to make sure that the software only mode with the
standalone server works again.